bitkeeper revision 1.1236.34.11 (423804f1RncutPGYUEnLp5awQB0EYg)

No need for wbinvd patches in agp driver in unstable tree.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/patches/linux-2.6.11/agpgart.patch b/patches/linux-2.6.11/agpgart.patch
index 4335ddb3cf4e9d868bbde745919b1fd527ffd3ff..ae38a6320947cf73c512b96623762537c51bc958 100644 (file)
--- a/patches/linux-2.6.11/agpgart.patch
+++ b/patches/linux-2.6.11/agpgart.patch
@@ -350,22 +350,3 @@ diff -rup pristine-linux-2.6.11/drivers/char/agp/uninorth-agp.c linux-2.6.11/dri
  
        for (i = 0; i < num_entries; i++) {
                agp_bridge->gatt_table[i] =
-diff -rup pristine-linux-2.6.11/include/asm-i386/agp.h linux-2.6.11/include/asm-i386/agp.h
---- pristine-linux-2.6.11/include/asm-i386/agp.h       2005-03-02 07:37:31.000000000 +0000
-+++ linux-2.6.11/include/asm-i386/agp.h        2005-03-11 00:35:21.331193069 +0000
-@@ -3,6 +3,7 @@
- 
- #include <asm/pgtable.h>
- #include <asm/cacheflush.h>
-+#include <asm/system.h>
- 
- /* 
-  * Functions to keep the agpgart mappings coherent with the MMU.
-@@ -19,6 +20,6 @@ int unmap_page_from_agp(struct page *pag
- /* Could use CLFLUSH here if the cpu supports it. But then it would
-    need to be called for each cacheline of the whole page so it may not be 
-    worth it. Would need a page for it. */
--#define flush_agp_cache() asm volatile("wbinvd":::"memory")
-+#define flush_agp_cache() wbinvd()
- 
- #endif